<<<<<<< HEAD
<ion-content class="content" style="background: #d2cdcd">
  <ion-slides zoom="true" [initialSlide]="homeOptions.initialSlide" [autoplay]="homeOptions.autoplay" [loop]="homeOptions.loop"
    pager>
    <ion-slide>
      <div class="banner banner-1"></div>
    </ion-slide>
    <ion-slide>
      <div class="banner banner-2"></div>
    </ion-slide>
    <ion-slide>
      <div class="banner banner-3"></div>
    </ion-slide>
  </ion-slides>

  <!--通知-->
  <ion-grid style="background: #ffffff">
    <ion-row class="notification-height">
      <ion-col col-2 text-left style="margin-top: 1.5rem">
        <ion-icon name="heart"></ion-icon>
      </ion-col>
      <ion-col col-10>
        <ion-slides zoom="true" [initialSlide]="homeOptions.initialSlide" direction="vertical">
          <ion-slide>
            <ion-list>
              <ion-item>
                <h2>My Neighbor Totoro</h2>
              </ion-item>
            </ion-list>
          </ion-slide>
        </ion-slides>
      </ion-col>
    </ion-row>
  </ion-grid>

  <!--并行图标-->
  <ion-grid style="background: #ffffff">
    <ion-row>
      <ion-col col-3 text-center>
        <ion-icon name="heart"></ion-icon>
        <div>新手必看</div>
      </ion-col>
      <ion-col col-3 text-center>
        <ion-icon name="heart"></ion-icon><br>新手奖励
      </ion-col>
      <ion-col col-3 text-center>
        <ion-icon name="heart"></ion-icon><br>安见资本
      </ion-col>
      <ion-col col-3 text-center>
        <ion-icon name="heart"></ion-icon><br>邀请好友
      </ion-col>
    </ion-row>
  </ion-grid>

  <!--待开发(活动页面)-->
  <ion-grid class="spacing" style="background: #ffffff">
    <ion-row>
      <ion-col col-12 text-center>
        精彩活动，敬请期待
      </ion-col>
    </ion-row>
  </ion-grid>

  <!--最后的list-->

  <homelist 
  *ngFor="let data of params.data" 
  [data]="data"
  [events]="params.events">
  </homelist>





</ion-content>
=======
<ion-header>
  <ion-navbar color="primary">
    <ion-title>首页</ion-title>
  </ion-navbar>
</ion-header>

<ion-content class="content">
    <ion-slides zoom="true" 
      [initialSlide]="homeOptions.initialSlide" 
      [autoplay]="homeOptions.autoplay" 
      [loop]="homeOptions.loop">
        <ion-slide><div class="banner banner-1"></div></ion-slide>
        <ion-slide><div class="banner banner-1"></div></ion-slide>
        <ion-slide><div class="banner banner-1"></div></ion-slide>
      </ion-slides>
        
      <actlist 
        [data]  ="params.data"
        [events]="params.events"></actlist>

    <hlist data="freestyle"></hlist>
    <hlist data="haha"></hlist>

</ion-content>
>>>>>>> 962917fd6029900f121fcc294b23f2b787e7a75d
